Skip to content

[ENH] For local: use subquery for FTS, unions for int & float metadata expr, is true -> is not null #4556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2025

Conversation

jairad26
Copy link
Contributor

@jairad26 jairad26 commented May 15, 2025

Description of changes

Move FTS to subquery approach for improved performance, and use unions in the case of int and float metadata, and replace is true uses with is not null to utilize db indexes
before (0.6.3):
image
image

after:
image
image

Test plan

How are these changes tested?

  • Tests pass locally with pytest for python, yarn test for js, cargo test for rust

Documentation Changes

Are all docstrings for user-facing APIs updated if required? Do we need to make documentation changes in the docs section?

Copy link
Contributor Author

Copy link

Reviewer Checklist

Please leverage this checklist to ensure your code review is thorough before approving

Testing, Bugs, Errors, Logs, Documentation

  • Can you think of any use case in which the code does not behave as intended? Have they been tested?
  • Can you think of any inputs or external events that could break the code? Is user input validated and safe? Have they been tested?
  • If appropriate, are there adequate property based tests?
  • If appropriate, are there adequate unit tests?
  • Should any logging, debugging, tracing information be added or removed?
  • Are error messages user-friendly?
  • Have all documentation changes needed been made?
  • Have all non-obvious changes been commented?

System Compatibility

  • Are there any potential impacts on other parts of the system or backward compatibility?
  • Does this change intersect with any items on our roadmap, and if so, is there a plan for fitting them together?

Quality

  • Is this code of a unexpectedly high quality (Readability, Modularity, Intuitiveness)

@jairad26 jairad26 changed the title [ENH] Use subquery for FTS, unions for int & float metadata expr, is true -> is not null [ENH] For local: use subquery for FTS, unions for int & float metadata expr, is true -> is not null May 15, 2025
@jairad26 jairad26 force-pushed the jai/local-chroma-perf branch from e2795bc to bdf96ce Compare May 15, 2025 18:34
@jairad26 jairad26 marked this pull request as ready for review May 15, 2025 18:46
Copy link
Contributor

propel-code-bot bot commented May 15, 2025

Local-mode query engine: switch to sub-queries (FTS) + union strategy for mixed int/float metadata

Re-implements how local SQLite queries are generated to improve performance and index usage. Full-text search now uses an IN (subquery) pattern instead of outer joins, and numeric metadata comparisons build two independent indexed selects (int + float) merged via UNION DISTINCT. Additionally, boolean key checks previously using is true have been converted to is not null. Extensive regression tests for null-key, FTS/metadata combinations, and edge cases were added.

Key Changes:
• Added create_union_subquery_for_int_float_ops to build UNION of int_value and float_value paths for all primitive operators.
• DocumentExpression now generates IN subquery against EmbeddingFulltextSearch instead of LIKE column join.
• MetadataExpression: removed inline int↔float OR logic; now delegates to the new union helper and ensures key column IS NOT NULL.
• Removed metadata/FTS left-joins in filter_limit_query; relies on subqueries and adds DISTINCT.
• Updated comparisons to use is_not_null() in several places for index friendliness.
• Purged redundant cast logic; large batch of new async tokio tests covering null metadata keys, mixed operator cases, and FTS×metadata interactions.

Affected Areas:
• rust/segment/src/sqlite_metadata.rs (query generation, tests)

This summary was automatically generated by @propel-code-bot

@@ -778,6 +858,8 @@ impl SqliteMetadataReader {

#[cfg(test)]
mod tests {
Copy link
Collaborator

@HammadB HammadB May 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest adding a few coverage tests for common edge cases

  • Metadata key null for one record, exists for another
  • FTS match but no metadata match

etc

@jairad26 jairad26 force-pushed the jai/local-chroma-perf branch from bdf96ce to 24c12cf Compare May 19, 2025 16:20
@jairad26 jairad26 merged commit b1ff4d7 into main May 19, 2025
71 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants